st/icon: Always show empty texture if both gicons are NULL

Commit 7ff7fb5d3b3ee655b1492226f68aeadac846e247 forgot to clear the
`priv->icon_texture` actor when returning from st_icon_update(), which
means we don't always switch to an empty icon if both gicon properties
are set to NULL.

Fix this and destroy the actor before returning early from
st_icon_update().

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1178

diff --git a/src/st/st-icon.c b/src/st/st-icon.c
index 5b3a2f24c9ec09c040186e7034fc096b2d561247..38d58205d5817c1e9f3bce28a56b36bcfc4ef165 100644 (file)
--- a/src/st/st-icon.c
+++ b/src/st/st-icon.c
@@ -420,7 +420,10 @@ st_icon_update (StIcon *icon)
     }
 
   if (priv->gicon == NULL && priv->fallback_gicon == NULL)
-    return;
+    {
+      g_clear_pointer (&priv->icon_texture, clutter_actor_destroy);
+      return;
+    }
 
   if (!st_widget_get_resource_scale (ST_WIDGET (icon), &resource_scale))
     return;